git merge vs rebase

visit shbcf.ru